js: Port Config to ESM

The Config module is shared between the main process, D-Bus
services and tests, which previously prevented it from being
ported to ESM.

The previous commit removed the last outstanding blocker, so
we can now port the last remaining module.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2880>

diff --git a/js/extensions/sharedInternals.js b/js/extensions/sharedInternals.js
index 76f488b7f0cdda4a9b6156269579b026c9ad2ceb..7fed3812a23e60907d9d7c469b5ada3a2023398d 100644 (file)
--- a/js/extensions/sharedInternals.js
+++ b/js/extensions/sharedInternals.js
@@ -4,7 +4,7 @@ import GObject from 'gi://GObject';
 
 import {bindtextdomain} from 'gettext';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 
 export class ExtensionBase {
     #gettextDomain;

diff --git a/js/misc/config.js.in b/js/misc/config.js.in
index e7884bdd52af5998705225f27832ad50c714504a..eef4d4ca1df1d84b2299618acfb40cd23ab2b5c2 100644 (file)
--- a/js/misc/config.js.in
+++ b/js/misc/config.js.in
@@ -2,20 +2,20 @@
 const pkg = imports.package;
 
 /* The name of this package (not localized) */
-var PACKAGE_NAME = '@PACKAGE_NAME@';
+export const PACKAGE_NAME = '@PACKAGE_NAME@';
 /* The version of this package */
-var PACKAGE_VERSION = '@PACKAGE_VERSION@';
+export const PACKAGE_VERSION = '@PACKAGE_VERSION@';
 /* 1 if networkmanager is available, 0 otherwise */
-var HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
+export const HAVE_NETWORKMANAGER = @HAVE_NETWORKMANAGER@;
 /* gettext package */
-var GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
+export const GETTEXT_PACKAGE = '@GETTEXT_PACKAGE@';
 /* locale dir */
-var LOCALEDIR = '@datadir@/locale';
+export const LOCALEDIR = '@datadir@/locale';
 /* other standard directories */
-var LIBEXECDIR = '@libexecdir@';
-var PKGDATADIR = '@datadir@/@PACKAGE_NAME@';
+export const LIBEXECDIR = '@libexecdir@';
+export const PKGDATADIR = '@datadir@/@PACKAGE_NAME@';
 /* g-i package versions */
-var LIBMUTTER_API_VERSION = '@LIBMUTTER_API_VERSION@';
+export const LIBMUTTER_API_VERSION = '@LIBMUTTER_API_VERSION@';
 
-var HAVE_BLUETOOTH = pkg.checkSymbol('GnomeBluetooth', '3.0',
+export const HAVE_BLUETOOTH = pkg.checkSymbol('GnomeBluetooth', '3.0',
     'Client.default_adapter_state')

diff --git a/js/misc/dbusUtils.js b/js/misc/dbusUtils.js
index ae7e2c9527771e7d4006fc75740662cae28652fc..2813de2a768243c12492795440032eee7005d44f 100644 (file)
--- a/js/misc/dbusUtils.js
+++ b/js/misc/dbusUtils.js
@@ -1,7 +1,7 @@
 import Gio from 'gi://Gio';
 import GLib from 'gi://GLib';
 
-const Config = imports.misc.config;
+import * as Config from './config.js';
 
 let _ifaceResource = null;
 

diff --git a/js/misc/dependencies.js b/js/misc/dependencies.js
index 9f1cd98084cb6f0bbe83cccc1dfcaf7449c7a1b4..c61753e651cd32d0899117c3a649d6ac62dc982f 100644 (file)
--- a/js/misc/dependencies.js
+++ b/js/misc/dependencies.js
@@ -26,7 +26,7 @@ import 'gi://Rsvg?version=2.0';
 import 'gi://Soup?version=3.0';
 import 'gi://UPowerGlib?version=1.0';
 
-const Config = imports.misc.config;
+import * as Config from './config.js';
 
 // Meta-related dependencies use a shared version
 // from the compile-time config.

diff --git a/js/portalHelper/main.js b/js/portalHelper/main.js
index 68d90e489f5df46ab7f15dda0849401863b6e222..7000089fa73432ffa4e79e23f4b84c49c45fc3e4 100644 (file)
--- a/js/portalHelper/main.js
+++ b/js/portalHelper/main.js
@@ -10,7 +10,7 @@ import {programInvocationName, programArgs} from 'system';
 
 const _ = Gettext.gettext;
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import {loadInterfaceXML} from '../misc/fileUtils.js';
 
 const PortalHelperResult = {

diff --git a/js/ui/extensionDownloader.js b/js/ui/extensionDownloader.js
index 826e61a6f536267f1fd61aae1df37af1a07fbca7..eb175797820f24c47399b435fefafdf47c49efdd 100644 (file)
--- a/js/ui/extensionDownloader.js
+++ b/js/ui/extensionDownloader.js
@@ -6,7 +6,7 @@ import GLib from 'gi://GLib';
 import GObject from 'gi://GObject';
 import Soup from 'gi://Soup';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as Dialog from './dialog.js';
 import * as ExtensionUtils from '../misc/extensionUtils.js';
 import * as FileUtils from '../misc/fileUtils.js';

diff --git a/js/ui/extensionSystem.js b/js/ui/extensionSystem.js
index 5ef995804791894fb0d7045bb53d7564406c72d5..21b3b196f7037df937bc495eaed07b50d4e1acad 100644 (file)
--- a/js/ui/extensionSystem.js
+++ b/js/ui/extensionSystem.js
@@ -7,14 +7,13 @@ import St from 'gi://St';
 import Shell from 'gi://Shell';
 import * as Signals from '../misc/signals.js';
 
+import * as Config from '../misc/config.js';
 import * as ExtensionDownloader from './extensionDownloader.js';
 import {ExtensionState, ExtensionType} from '../misc/extensionUtils.js';
 import * as FileUtils from '../misc/fileUtils.js';
 import * as Main from './main.js';
 import * as MessageTray from './messageTray.js';
 
-const Config = imports.misc.config;
-
 const ENABLED_EXTENSIONS_KEY = 'enabled-extensions';
 const DISABLED_EXTENSIONS_KEY = 'disabled-extensions';
 const DISABLE_USER_EXTENSIONS_KEY = 'disable-user-extensions';

diff --git a/js/ui/main.js b/js/ui/main.js
index c47b7c5475d9673c4db39c425f2f092dfef27784..a96d8df7c95aed0945889ae02b4c04289de79e44 100644 (file)
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -10,6 +10,7 @@ import St from 'gi://St';
 
 import * as AccessDialog from './accessDialog.js';
 import * as AudioDeviceSelection from './audioDeviceSelection.js';
+import * as Config from '../misc/config.js';
 import * as Components from './components.js';
 import * as CtrlAltTab from './ctrlAltTab.js';
 import * as EndSessionDialog from './endSessionDialog.js';
@@ -45,7 +46,6 @@ import * as KbdA11yDialog from './kbdA11yDialog.js';
 import * as LocatePointer from './locatePointer.js';
 import * as PointerA11yTimeout from './pointerA11yTimeout.js';
 import * as ParentalControlsManager from '../misc/parentalControlsManager.js';
-const Config = imports.misc.config;
 import * as Util from '../misc/util.js';
 
 const WELCOME_DIALOG_LAST_SHOWN_VERSION = 'welcome-dialog-last-shown-version';

diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js
index a11e087f70a2ac7027f475d5b76d5869e0a5bae8..183279ee9f7ab119b8326899f4a41897ec05e1bf 100644 (file)
--- a/js/ui/notificationDaemon.js
+++ b/js/ui/notificationDaemon.js
@@ -7,7 +7,7 @@ import GObject from 'gi://GObject';
 import Shell from 'gi://Shell';
 import St from 'gi://St';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as Main from './main.js';
 import * as MessageTray from './messageTray.js';
 import * as Params from '../misc/params.js';

diff --git a/js/ui/panel.js b/js/ui/panel.js
index cd8ebc1ec29cc8db1334b2472f784ee3878753eb..6fb90ac2fb1392932fb1735eb2016add46e43a6e 100644 (file)
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -10,7 +10,7 @@ import St from 'gi://St';
 
 import * as Animation from './animation.js';
 import {AppMenu} from './appMenu.js';
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as CtrlAltTab from './ctrlAltTab.js';
 import * as DND from './dnd.js';
 import * as Overview from './overview.js';

diff --git a/js/ui/scripting.js b/js/ui/scripting.js
index d0fb10d5d2694cd56d6ffd3b8f2dbf734c1c758d..db245c0f47ef4fa8b7d67843bcfbf028bbb41123 100644 (file)
--- a/js/ui/scripting.js
+++ b/js/ui/scripting.js
@@ -5,7 +5,7 @@ import GLib from 'gi://GLib';
 import Meta from 'gi://Meta';
 import Shell from 'gi://Shell';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as Main from './main.js';
 import * as Params from '../misc/params.js';
 import * as Util from '../misc/util.js';

diff --git a/js/ui/sessionMode.js b/js/ui/sessionMode.js
index a41963676ec523ff55ed54dd3f0e528fbe064393..8e30a665c0dd6c9ed5404a4ad58ac37fef6fb409 100644 (file)
--- a/js/ui/sessionMode.js
+++ b/js/ui/sessionMode.js
@@ -9,7 +9,7 @@ import * as Params from '../misc/params.js';
 import {LoginDialog}  from '../gdm/loginDialog.js';
 import {UnlockDialog} from '../ui/unlockDialog.js';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 
 const DEFAULT_MODE = 'restrictive';
 

diff --git a/js/ui/shellDBus.js b/js/ui/shellDBus.js
index 370f3349740d7243a81b640d08d81aa28dbc205b..12ca261c89a6a6cd6cfd4f71e25f0562cc212d03 100644 (file)
--- a/js/ui/shellDBus.js
+++ b/js/ui/shellDBus.js
@@ -5,7 +5,7 @@ import GLib from 'gi://GLib';
 import Meta from 'gi://Meta';
 import Shell from 'gi://Shell';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as ExtensionDownloader from './extensionDownloader.js';
 import * as ExtensionUtils from '../misc/extensionUtils.js';
 import * as Main from './main.js';

diff --git a/js/ui/welcomeDialog.js b/js/ui/welcomeDialog.js
index 3295e49fd587a285c84c92c9dee15122c754d1d1..6c5507fa7b000953f2d0bcebc3fe8dcaad3ccff2 100644 (file)
--- a/js/ui/welcomeDialog.js
+++ b/js/ui/welcomeDialog.js
@@ -5,7 +5,7 @@ import GObject from 'gi://GObject';
 import Shell from 'gi://Shell';
 import St from 'gi://St';
 
-const Config = imports.misc.config;
+import * as Config from '../misc/config.js';
 import * as Main from './main.js';
 import * as Dialog from './dialog.js';
 import * as ModalDialog from './modalDialog.js';